projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2eecaa2) | patch
* lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New var
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 18 Feb 2019 14:43:59 +0000 (09:43 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 18 Feb 2019 14:43:59 +0000 (09:43 -0500)
commit2ede38ce4bf336c573450c61a2e9a41fb7ebe1be
tree2d4a9ddfc202cbc9859a1818a325409f58a71b07tree | snapshot
parent2eecaa28972320a1b8886ac8cde353c2a2f4aa44commit | diff
* lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): New var

(smerge-vc-next-conflict): Obey it.  Save buffer before going to
the next.  Don't emit message when vc-find-conflicted-file can't find
other conflicted file.

* lisp/vc/vc-hooks.el: Use lexical-binding.

* lisp/vc/vc.el: Remove redundant :groups.
(vc-find-conflicted-file): Autoload.
lisp/vc/smerge-mode.el diff | blob | history
lisp/vc/vc-hooks.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.